Misc minor style cleanups and warning fixes.

diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c
index e2423a5b1f3b6dd34b322feb03c60eea50624986..efa433f033f15cce6e2df34121337f514e99b587 100644 (file)
--- a/gpsbabel/csv_util.c
+++ b/gpsbabel/csv_util.c
@@ -43,7 +43,6 @@ extern char *prefer_shortnames;
 extern const char *gs_get_container(geocache_container t);
 extern geocache_container gs_mktype(const char *t);
 extern geocache_container gs_mkcont(const char *t);
-extern const char *gs_get_cachetype(geocache_type t);
 
 static double pathdist = 0;
 static double oldlon = 999;

diff --git a/gpsbabel/filter_vecs.c b/gpsbabel/filter_vecs.c
index 238d93e102216c8fec45c7e29bebe4702c68c30f..08b832f83d491cd5c6856b8d366b2a571c741c51 100644 (file)
--- a/gpsbabel/filter_vecs.c
+++ b/gpsbabel/filter_vecs.c
@@ -204,7 +204,7 @@ alpha (const void *a, const void *b)
         const fl_vecs_t *const ap = a;
         const fl_vecs_t *const bp = b;
 
-        return strcasecmp(ap->desc , bp->desc);
+        return case_ignore_strcmp(ap->desc , bp->desc);
 }
 
 /*

diff --git a/gpsbabel/jeeps/garminusb.h b/gpsbabel/jeeps/garminusb.h
index edc7b800d11c3e14e0aa550da168f88d9975ecb5..96acc923257d5292c74ef7d26afe8eb329fef504 100644 (file)
--- a/gpsbabel/jeeps/garminusb.h
+++ b/gpsbabel/jeeps/garminusb.h
@@ -56,3 +56,4 @@ int gusb_cmd_send(const garmin_usb_packet *obuf, size_t sz);
 int gusb_cmd_get(garmin_usb_packet *ibuf, size_t sz);
 int gusb_open(const char *portname);
 int gusb_close(const char *portname);
+int gusb_init(void);

diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.c
index d62dd956521e22f0bcd3c8f615c71e0e37fbc397..5128ad809014c6c48cfa7e74ef07f4d3f38248c9 100644 (file)
--- a/gpsbabel/jeeps/gpslibusb.c
+++ b/gpsbabel/jeeps/gpslibusb.c
@@ -52,6 +52,7 @@ static        usb_dev_handle *udev;
 static void garmin_usb_scan(void);
 static void garmin_usb_syncup(void);
 
+int
 gusb_init(void)
 {
 // usb_set_debug(99);

diff --git a/gpsbabel/maggeo.c b/gpsbabel/maggeo.c
index 94cddd34ff496e55802498687865a60ff78e4c99..f9496010784a189fc9c73006ff8e26371d617ed1 100644 (file)
--- a/gpsbabel/maggeo.c
+++ b/gpsbabel/maggeo.c
@@ -100,6 +100,7 @@ maggeo_fmtdate(time_t t)
  * cleansing it of NMEA-isms and decomposing to ASCII as we go.
  */
 static
+void
 append(char *buf, const char *str)
 {
        char *cleansed1, *cleansed2;

diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c
index ce45907b8617e6de366e9375e9649b11f28fcb7c..b670d31d9a10b568b277089288e31583029cc232 100644 (file)
--- a/gpsbabel/mkshort.c
+++ b/gpsbabel/mkshort.c
@@ -425,6 +425,9 @@ mkshort_from_wpt(void *h, const waypoint *wpt)
        if (wpt->notes) {
                return mkshort(h, wpt->notes);
        }
+
+       /* Should probably never actually happen... */
+       return NULL;
 }
 
 

diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index 388cd2d1ff3b7a287c0de5b3534e312a21534f18..c391b813b8ed554f3392a89f78399f5e7f87125c 100644 (file)
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -739,9 +739,9 @@ disp_formats(int version)
                                vec->extension? vec->extension : "", 
                                vec->desc);
                }
+               xfree (svp);    
                break;
        default:
                ;
        }
-       xfree (svp);    
 }